From 71eab1406625791cdc0f0be0f8741e1e26184f29 Mon Sep 17 00:00:00 2001
From: Juanma Barranquero <lekktu@gmail.com>
Date: Thu, 19 Aug 2010 01:32:39 +0200
Subject: [PATCH] lisp/ChangeLog: Remove merge markers.

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3c17922975..abe6dce43e2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -73,7 +73,6 @@
 	(ctext-no-compositions): Doc fix.
 	(compound-text-with-extensions): Doc fix.
 
->>>>>>> MERGE-SOURCE
 2010-08-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* simple.el (exchange-dot-and-mark): Mark obsolete, finally.
-- 
2.30.2